Extra protection for subsystem check
Final touch with subsystem checking