Bugfix, (partial) support for handlers