Fix for RWD