Just fixing stuff in bunches call