Attempt #1 of fixing issue #1