fixed #26
fixed #29