Attempt #2 of fixing issue #1