Bug Fixed - 12042014