Followup to that last commit