Resolved collision bugs