fixed #22
fixed #24