diff --git a/PWGCF/FemtoWorld/Core/FemtoWorldContainer.h b/PWGCF/FemtoWorld/Core/FemtoWorldContainer.h
index 910d2631026..43cef18371b 100644
--- a/PWGCF/FemtoWorld/Core/FemtoWorldContainer.h
+++ b/PWGCF/FemtoWorld/Core/FemtoWorldContainer.h
@@ -146,9 +146,6 @@ class FemtoWorldContainer
 
     TLorentzVector sumVec(part1Vec);
     sumVec += part2Vec;
-    if (mHistogramRegistry) {
-      mHistogramRegistry->fill(HIST(mFolderSuffix[mEventType]) + HIST("relPairInvariantMass"), sumVec.M());
-    }
 
     if (mHistogramRegistry) {
       mHistogramRegistry->fill(HIST(mFolderSuffix[mEventType]) + HIST("relPairDist"), femtoObs);
@@ -162,6 +159,7 @@ class FemtoWorldContainer
       mHistogramRegistry->fill(HIST(mFolderSuffix[mEventType]) + HIST("MultPtPart2"), part2.pt(), mult);
       mHistogramRegistry->fill(HIST(mFolderSuffix[mEventType]) + HIST("PtPart1PtPart2"), part1.pt(), part2.pt());
       mHistogramRegistry->fill(HIST(mFolderSuffix[mEventType]) + HIST("relPairDetaDphi"), delta_phi, delta_eta);
+      mHistogramRegistry->fill(HIST(mFolderSuffix[mEventType]) + HIST("relPairInvariantMass"), sumVec.M());
     }
   }
 
diff --git a/PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h b/PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h
index d65f913dda7..bc1017d7003 100644
--- a/PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h
+++ b/PWGCF/FemtoWorld/Core/FemtoWorldParticleHisto.h
@@ -66,6 +66,9 @@ class FemtoWorldParticleHisto
         /// Cascade histograms
       } else if constexpr (mParticleType == o2::aod::femtoworldparticle::ParticleType::kPhi) {
         /// Phi histograms
+        int mInvBins = 1000;
+        framework::AxisSpec mInvAxis = {mInvBins, 0.5, 1.5};
+        mHistogramRegistry->add((folderName + "/InvariantMass").c_str(), ";M_{K^{+}K^{-}} (GeV/#it{c}^{2});", kTH1D, {mInvAxis});
       } else if constexpr (mParticleType == o2::aod::femtoworldparticle::ParticleType::kPhiChild) {
         /// Phi daughters histograms
       } else {
@@ -101,6 +104,7 @@ class FemtoWorldParticleHisto
         /// Cascade histograms
       } else if constexpr (mParticleType == o2::aod::femtoworldparticle::ParticleType::kPhi) {
         /// Phi histograms
+        mHistogramRegistry->fill(HIST(o2::aod::femtoworldparticle::ParticleTypeName[mParticleType]) + HIST("/InvariantMass"), part.mass());
       } else if constexpr (mParticleType == o2::aod::femtoworldparticle::ParticleType::kPhiChild) {
         /// Phi daughters histograms
       } else {
diff --git a/PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h b/PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h
index 86e5e73594c..f536077ce95 100644
--- a/PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h
+++ b/PWGCF/FemtoWorld/DataModel/FemtoWorldDerived.h
@@ -74,7 +74,7 @@ DECLARE_SOA_INDEX_COLUMN(FemtoWorldCollision, femtoWorldCollision);
 DECLARE_SOA_COLUMN(Pt, pt, float);                    //! p_T (GeV/c)
 DECLARE_SOA_COLUMN(Eta, eta, float);                  //! Eta
 DECLARE_SOA_COLUMN(Phi, phi, float);                  //! Phi
-DECLARE_SOA_COLUMN(Mass, mass, int8_t);               //! Mass of the particle
+DECLARE_SOA_COLUMN(Mass, mass, float);                //! Mass of the particle
 DECLARE_SOA_COLUMN(PartType, partType, uint8_t);      //! Type of the particle, according to femtoworldparticle::ParticleType
 DECLARE_SOA_COLUMN(Cut, cut, cutContainerType);       //! Bit-wise container for the different selection criteria
 DECLARE_SOA_COLUMN(PIDCut, pidcut, cutContainerType); //! Bit-wise container for the different PID selection criteria \todo since bit-masking cannot be done yet with filters we use a second field for the PID
diff --git a/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTask.cxx b/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTask.cxx
index 4b8bc1eef15..a8d62cd34bc 100644
--- a/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTask.cxx
+++ b/PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTask.cxx
@@ -689,7 +689,7 @@ struct femtoWorldProducerTask {
         float phiP = sumVec.P();
         float phiM = sumVec.M();
 
-        if ((phiM < ConfInvMassLowLimit) || (phiM > ConfInvMassUpLimit)) {
+        if (((phiM < ConfInvMassLowLimitPhi) || (phiM > ConfInvMassUpLimitPhi))) {
           continue;
         }