I will, I just preferred to do this in a separate commit since it's a different bug