Fixed Risu's avy