IFCW

Fix some failed unit tests from #1307 (actually, the PR's number is very good :) )