Fixed faulty return