fixed issue6