Probably a real fix for the chaining