new fix to bug 1111