Fix RWD bug