Fixed simplification but performance not improved