BF: Fix issue #8