Add a fix for async content loading