fix issue 26