fix feature #4551