Warming up for Issue #366 and #367
Fix for an Issue #367