Temporary fix for issue #70