an attempt at fixing dolores, but not sure it's correct.