Work around for issue #101