Fix for bug 1187311