fix issue 82