Fixed an issue from a merge