This needs a better check as well.