Fix for new compiler