adjusted list-type checking at a few cases