one more fix for collision