Fix for ASYNC-19