fix some collision