Follow up to #1452
Follow up to #1452