(from a previous iteration I did on this bug)