Fix: Handler-Bug