Fix use order…again