Fixed a bug in the last bugfix. Let's never mention it again