big fix for setting --KW