Fixed issue6