added fix for ASYNC-44