Fixed collision bug......again

Changed collision detection to fix bug