Issue #667 working on a fix