Small workflow improvement