fix issue 31