Start fixing https://hackerone.com/reports/32529