fix collision issue