make it work with newest Martini