Fixed bad merge c922f2ba