@Tobion could you submit a PR please ?