Issue #76

Issue #76 fixed.