beta 1.4, fix collision bug