Synchronization around detection, fix