Fix for new engine scheme