Resolve http://govuk.zendesk.com/tickets/92068