#2759: Amend previous patch