Temporary fix for UD w/ quotes for ONE backend