Issues/779@v2

Close #779