fixed #11
fixed #2