Added patch to fix this issue