* BIM: ensure the Base has the correct type - fixes #16409 * BIM: refactor according to chenne's comment