Attempt #2 to fix the same issue.