#2269 making changes to fix using multiple reward types