fix PR#2261 in a different way