JDO fix, hopefully...