Fixed AMA and custom commands