[Fix] Returning correct value when empty