Fix states patch