Fix bindings towork with new parser