Partial fix for bug #913