Parser fix + removed redundant attribute