Change the order of start-up
Merge pull request #863 from rimms/fixed-854

Change the order of start-up