temporary fix for issue #118