deadlock fixed in 2.0-M3