changed a handling of compl.data