fixed #24
fixed #24