This check can be simplified too