This is a better check