This solution sorted it for my use case