Winsuite - Fix