Fix new instance creation