Stop chaining internal methods

Close #785