Additional fix for previous commit