I'll check that again, since this would make the logic here easier.