trying to fix issue 2