Fix #31 #32