Fixed a critical ordering bug
Merge pull request #1426 from gem/fix-sourcemodel-ordering

Fixed a critical ordering bug