Fix for bug #1328