Fix issue6
Fix issue6