Fixed Spigot support (was static initializer bug)

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>