Fix: returning boolean rather than string