Fixed 'Bug 16130 - Invalid Redundant assignment'