Fix collision short circuit thing bug