fixed #7
fixed #6