Yet another fix, Attempt 2.