fixed jpa stuff