Fix same task name retrieval collision