Another attempt at fixing the chaining issue...