Non-stupid fix for GB crash