Bugs Fix Issue ABJ per 26 Feb 2012