Fix: issue6