Fix merge issue from previous commit