Critical fix for new chain