Hack to fix the 2dfmc, part 2