Fixing collision