fix for ASYNC-20