Fix incorrect merge of latest changes