Switched to final-encoding of parsing as well