BF for issue #121