Better fix for Bungee