OPAL-2190: Overly long method fix