Added extra model check to prevent that a simple module is treated as module (ref #1097)