Added controls to avoid parsing problems