fix issue 7