Attempt #2 to fix bug.