Fix what I broke

Roland's fix of what I broke :/