Trying to fix bug #2357.