Fixed one collection get issue but not all
Merge branch 'master' of https://github.com/SwampCo/Motherlode