Stop being lazy, Zwei

Fixing the problems.