Attempt #1 to fix the issue