fixing upstream issue #92