FIxing complex operations