Make it work with new imp version