fix bug Issue #1