Follow up on #440
Follow up on #440