rayslava Keep compatibility with modern avy package …