issue 475: working ok on limited tests