Closes Issue #1243
Attempting to fix Issue #1246