OPAL-1874: Using toSafeArray