fixed up possible issues in multiword