https://github.com/Vanilla/Vanilla/pull/611