CON-1129: Added suffix after check if label is not undefined