Temporary fix for page refresh