fix issue 31 and 70