Fix block ordering