Fix for bug 1218