Fixing GitHub Issue #5