Fix referencing problem