Bugfix foreshadowing more bugfixes.