fix issues 2nd