fixed #23
fixed #22