making things more @jvoisin compliant