Patch to make it work for the moment