Fixed #32 #33