FS-5498 fix state change
FS-5500 --resolve