Fix update from yaml
Merge branch 'fix-update'