issue #745, first fix