Is this the right return value?