Improve docking check