fix RWD bug