Fix extension order