fix for Issue #99