Fix to issue #408
merged