collide fix + shift state fix