Issue introduced by earlier PR