Fix for the chaining