Add a fix for invalid position kicking