Fixes state-override range preservation