async fixes (1.6.x)

corresponds to issue #50