Fix Former use