Bug fix - metadata upgrade