addressed bug herd amends on 22.JAN.2014