issue #164, 169