Issue #414

Issue closed (checked with Thomas Betous)