I prefer this fix to #1143, but thanks anyway @lucaswerkmeister