fix bug Issue #3