Updater resolve #8