Fix issue with first instance creation