Fix for normal gameplay