fix data container name condition