Fix for Issue 1479

Trying to preserve the original intent of the code block.