Fix bug Issue #2