Respect file loading order

This should be fixing the remaining of #44