Things like this keep me up at night, fixes #6670