Fixed collision bugs