Partial fix for Issue #177