BUGFIX: matches VALIDWORD fix