Follow up on #2280
Follow up on #2280