Is there a way to clean this bit up? Matching on the actual version feels a bit dirty...