Fix for bug 406

Fix for bug 406