For ENG-5228, fix missing shift and test case