Partial fix for Issue #17