fixup s2w bugs, thx maxwen for expenations :)
revert JRCU, probably this will fix deadlog bug