Fixed remaining time agian