agree we shouldn't make that assumption, adding a check