Fix: Invalid context warning