fixed collision again