Windows behavior fixed