BUG: Fix for "CANDIDATE" not found