[BUGFIX] fix the dreaded Wirium desync-on-removal bug