Fixed async deadlock. See bit.ly/18hkbws