Phase2 shk22

Bug fix to Phase2-shk21