Added another chaining edge case and found another bug