fixed #6
fixed #4