Adds a better check