Fixed bugs in RDSF