fix issue 2