Trying to fix the issue, part 1