Temporary collision fix