Fixes use order