Quick workflow short term fix