Core: fix command $Supports (issue 1395)