Fix bug with one instance creation