an attempt at fixing alvarez.