fix issue 83