Follow up to #558
Follow up to #558