Controller fixed - Windows support