fixed chaining issues