Fixed issue with foward-word et al