Issue #211 - corrected to comply with the agreed approach.