Switch lazy loading order
Merge pull request #722 from ArthurClemens/lazy_order

Switch lazy loading order