Fix for transactional persistence exceptions