fix issue 9