Added patch to fix regression