Fix for saving without product template