Issue #770 Fixed