Fix resolving constructor arguments