fix issue 25