Bug fix requested by AMO reviewers