OM Followup Issue from PR by @openmercato · Skillet