fixed async problems with parse/expand