fix bug where @rds always nil
merge master