Bug fix for bug #132