hack: Encapsulate MOGA hack and apply everywhere needed.