Resolve VECGEOM-540
Partially fixes VECGEOM-540 Detailed explanation of the fix done in: https://sft.its.cern.ch/jira/browse/VECGEOM-540
Partially fixes VECGEOM-540 Detailed explanation of the fix done in: https://sft.its.cern.ch/jira/browse/VECGEOM-540