yay fixed collision issue