Bugfix for then-method