fix issue 34