This PR is a cheap fix for this issue that I don't have time to properly fix right now.