Shrihari/Arakali: Fixed a bug that popped in during merge