Fixing object creation