Work around for migration into Martini