fix issue 6