#632 fixed