Make a better check like the TODO says.