fixed collision issue