Bugfix: removed handler not implemented