Fix left-over merge issue from previous commit