#3173 fixing