Fix for bug #1275