fix xxx issues
Merge pull request #284 from SEL-Columbia/xxx_fix

fix xxx issues