Remove working except on refresh