Fix for empty target contact id