fix issue 67