Fix for bug #3148