this should close issue #8