Change order of definitions