fix issue 37