fixed #3
fixed #7