Issue #107: Restore changes for issue #215