Fix for RWD issues