Fixed some collision mask issue