Hack timing to make it work - giving up on investigation for now