Make refreshing after a kick much more reliable