RWD bugfix