OPAL-2393: Extract method