Bugfix in Handler (by Ben & Matthias ;)