fix status change issues