Change the load order
Merge pull request #97 from mifoscontributer/bugfix

Change the load order