Patched Issue #74