Follow up of #470
Follow up of #470