Fix constructor call implementation

however this is breaking :(