v3_5.cfm script fix from develop-4 branch