Nasty delay fix, but better connectivity