Fixed maximize state persistence