Partial fix for bug #132