Fix Bug 679
bug 679: add respective unit test