Fix for pickup form on checkout