[Reviewer: Ellie] Fix crest issue #162