Integrated Oliver Yeoh's domain pattern fix