fix issue 1