BB 1.6, see #66