Trying to fix the missing item bug once and for all!
Merge branch 'origin/master'