Fixed ordering issue
1.0.2