Fix reorganise