Fix for bug #3107.