WIP: chain-bug-fix