Follow up to #634