Fix chaining mode. Was never really tested, so wa buggy