fix collision bugs