Fixes #2747
Co-Authored-By: Max Leiter <hello@maxleiter.com> Co-Authored-By: Jérémie Astori <astorije@users.noreply.github.com>