Fixed the errors that Sebastian introduced (and didn't bother to fix).