Fix to the issue on persistence unit