fixed #804
fixed #803