fixed #2
fixed #1