temporary workaround for hijack timing issue