shouldn't we have some more strict validation here (and elsewhere) ?