CDB-2920 wrong code selected, reverting to correct one