Attempted to fix #6227, not entirely sure if it's a problem as I'm having a hard...