fixed #31
fixed #27