fix the mess surrounding named-blocks