Added patch to remove the need for WSME