Yet another absolutely broken commit

Well, atleast it doesn't crash! Right?