Workarounds for JENA-767