Use my forked guard-spinach to fix issues