56: Fix bugs r=kvark a=torkleyy

Turns out I actually used this pattern 3 times..