Quickfix to latest patch.