Fixing mainnet crash