fix Conditional attributes