third fix for courier feature