From Henning Rogge: fix SPF bug