Crest_158C_1245C fix