fixed #17, #18