fix long wait for match