temporary fix for issue #81