Fix workaround for JENA-767