Rework on FCB. Fixes #41