Added regression fix but realizing DRY optimization