Fixed Parser Errors