fixing pop states