fix for ASYNC-47