Bugfix in handler init.