BF: issue # 77