Support AVS-2.4 and Bug fix