re-arrange to fix