Another way to fix the issue