fix bug Issue #295