simplification fix