fix regression on issue 922