jpa huge fix
stable version ready for branch