fixed #9
fixed #8