Fixed bug to use .kwd data where available