Fix for bug #1431