Fix constructor

Better constructor organisation to avoid data loss