Fix for bug 123
