Fixing controlled and windowed