Fixed enabled/disabled in the AOCommand