Now #2 is fixed