Fixes Issue #6