Fix order issue

FIx #91