Fix constructor signature