Update Fix for Bug12