Maybe this Fixes Issue #2 ?