Fixing collision bugs