icarito Fixes from glitch