issue #124

resolves #124