LPS-51672 Additional fix to reflect the changes
LPS-51672 Fall back to the string one for simplicity
LPS-51672 Add test for this