Fix all by reference error