Additional fix to previous commit