Feature/win rs fix