Fix refresh handler