Fix: extra guard required