Improved collision detect check