Follow up to #1012