Fix: Do not link arguments to constructor