Better fix for compiler warning