Fix for latest spigot patch