temporary fix to Issue #9