update from kris
fix merge issue