is it fixing another issue? If yes, I think we should have a separate PR