Issue #667 Fixed