issue #21482: fixed orm types