Fix issue6