issue5 like
fixed issue6