Additional fix