fixing up an issue with wrong references with initial checkin