more simplification fix