this has not been addressed: is this considered a cosmetic change to be addressed in another PR?