FIX: fix dialect block ordering