Bug fix for commit 4ce16792e72e9e33be28bc8277a5ad8ebb291ca0 - Issue #237