improved collision avoidance (also for table)