fixed #8
fixed #7