fixed #181
fixed #178