fixed #16 #17