Fix long-form constructor