Fixed again, word/dword problems