Fixes more issues caused by global recursiveness of -1