(hopefully) fixed collision stuff