Bug 3384: Working on fix