Hype behavior fix