fix issue 38