Bugfix in RS