fix a "false success" problem caused by discrepancy between test and live systems...