fix issue 35