Fix outdated data bug
Merge origin/master