Fix for invalid difficulty/terrain handling