Fix duplicate constraint optimiser