Consolidation revisted [#389]