Follow up of #23
Follow up of #23