Fix issue from merging