fixed #7
fixed #7