Fixed #16 #17