Fix previously incomplete commit