Change the order to make the code work around.
Merge pull request #249 from runawaygo/master

Change the order to make the code work around.