Added Ruchiras fix