Fix RSBT bug, all set