Bugfix: that.handler