added a fix for collision