Fix: Check for key existence