fixed #7
fixed #8