fix issue 8