Apply Noel's fix from master branch to redesign