Make davillas patch work