fixed #158
fixed #158