fix issue 29 #29