fixed #15 and #17