Fix faulty merge in pervious commit