datanucleus enhancement fixed