Fixed error introduced during merge