Something be broken :O

Warning! Only half a commit. Was divided by diamond.