Fix for computeTsirMap