Rivera attribute affects fix

Creating branch rivera-attribute-affects-fix