Fixes #8483 windows problem