Fixed collision issues.