fix for bug #1369