Fixed collision bug