patched for FW6