#1113 | +RahulK, +RahulJ, Riya | Fixing nasty multi-threading bug