Commited after jibx bindings crashed.