Fixing Issue #40