fix issue 85