fix issue 3