[Fixes #6854954] because I am awesome