Attempt to fix bug 5616