Fix for last compiler update