Better workflow compatibility fix