Fixes the strength portion of #2422, if this fix is acceptable then one will follow for the other fields.