(unstable) [fixed] deadlock

Change-Id: Id62f030510b238187154fcd4cf82687df0b5618c