fix regression on issue 152