amendmend to preceding bugfix