Fixed collision issue