fix issue 61