Fix FFC issue 21