#3234 fixed