Additional fix for #1