Fixed for latest scala-common-enrich