Fix: test if not empty