move to refresh event again and bugfix