fixed #12
fixed #11