[BF] Fix regression - fixes #186