Bug fix for bug #104

Bug fix for bug #104

Prerequisite is Merge #103