fixed #22
fixed #23