Temporary fix for async

This should be fixed in server side, until that we just don't need to
use.