fixed #143
fixed #144