LPS-42950 Avoid use an array where it could be a single object