JUDDI-880 fixed