Make description more robust