Remove +1 for indicators, making the code simpler