temporary fix for issue #3