fixed #714
fixed #717
fixed #718