Added in support to bug #918344