5.004_04 workaround