ROBE-240 fixed hibernate problems