Fixes collision bugs