issue 516: possible fix