Fix for #71

Fix for Issue #71.