fixes the nonfunctional order
Merge pull request #102 from finnlabs/fix/nonfunctional_order

fixes the nonfunctional order