Workaround for the previous universe problem