SFR-13 Bug fixed