#439 change attribute logic