Issue #1 is fixed