Fix for HoR trash waves