sync with hxparse changes
export