this should resolve issue #162