Fix #1379 completely

Apply @dreamsxin 's fixes to other parsers

See #1379