Fixed singletonize migration AGAIN