Refresh on demand
Bug fixed