Fix Former facade