Refresh with bugfix