fixed collision bug