Fixing collision bug