This order change have huge impact on performance. Please make another PR against master for that change!!!