post_parse_handlers improvement