Fix for new patch