Fixed collision issues