2nd attempt to fix references