This check can be improved, too.