Issue440

This MR contains the changes discussed on a previous MR (!346 (closed)) that was closed as it was done from a fork. A test has been added that exposes the issue described in Issue 440 and a fix has been applied in the recommended location.

Fixes #440 (closed).