fix to RDS Bypass for CF