Fixed singletonize migration