fixed the chain to emulate the old behavior