Rivera attribute affects fix