Added error correction