fixed #166
fixed #167