wish to fix issue 7