added Saptarshi's fix