Better fix for falling out of world issue
v0.1.8