update for Issue #2