Fixed checkbox issue again