Fixed persistence across config changes