Fix of Bug 7

Fix of Bug 7