fixed #13, fixed #11