Fix py33 issue with dict ordering