fix typos
Split then_ into two methods then_ and then__
Merging typos fix from Tomas Hradec