fixed #1068
fixed #1069