John's fix for product form