Guard Spork fix