fixed nandu's changes