Fixing the change from type -> ref.