Bugfix take two.