possible fixes to first keyword stripping