Follow up to 851c4180bd153332665dcb4133081ef4702069b6