Added patch to pass tests