Fix for spigot API not being finished yet.