Enhanced controller check (issue #1)