temporary fix for refresh issue