fixed #13, #12