Fixing and verification (incomplete)