fixed #12, #13