Fix: empty string correctly handled