Fix for production issue related to workflow screen failing