Bug fixed on RS