fixed to API Ver 1.1