fixed #4
fixed #5