Fix: Typing