Fixed WP_OnceForm, synced upstream