fixed #26
fixed #27